Two drawing challenges in one with some changes

2 18