Made some update for the next submission