Version with my solution