UPDATED working on main view.