optimize
modification of navigation