end of 9 with some fix