updated my code