Small update of onDraw