Update ANS: Class 5 Test ch 2 and 18