Abhinav/Nazneen: Updating code for Viewing issues.