Completed my solution