Update with my solution