updated for navigation / relay