updating the view... working progress
fixing merge conflict