modified shapes, draft 1.1