modified the views and comments