Code optimised for new Navigation Category