tweaked nav type
merged conflict