2.12 Do while errors corrected