Added more functionality to State 1