Update information presented to user
Added support for commenting