ADDED full logic changes for view modifying