Refuctoring view 3