Added a few more places where draw is called