Updated with through ch2 num5