Revamped view 2