better nav but worse code