Changes To View Logic