improved flow of end-of-round procedure