PR changes
PR changes.

refactoring view