Updated my code