We should apply this to the other functions in draw as well. Would you do that?