- updated with drawing collisions and new editing features