playing with main view
merged changes