fixed ch 11 and 12