updated views logic