Refuctoring view 2