added 1.11-12, 1.16-18