Updating with my code