Updated Draw Method