distance added, transport_data moved to form partial