Working on fixing viewporot
Merging