Naviagtion and some restructure