Fixed up the draw method