changing some views to be more clear.