draft 1 annotations - 2/3 fixed