updated views with new logic