nav working
merged