Added comments and continued wait making the viewchange class