Modifications to Navigation