7th commit - refining the view