final commit before merging fancy-nav branch