more nav rework, good grief