distance optimization added as a test choice