Made Update more consistant with Draw