updated with my code