Updated to include navigation variables