Added callback function to navigator.cpp