2014.7.8.1943

small changes to accommodate navigation development