updated my solution