finished following up to 11.2.2