Uses navigation generation again