Reworked view model