Updated my solution