Updated with my code