more work on draw