Working on views
Merged
Merged