Switched back to Distance, caused too many problems