task 2.3 fixes