Code changes for views