Made Changed according to Udacity