removed hardcoded distances