Took out comments, restored view functionality