Merge "updating 1st view"