changes to view logic