P035: improved solution