minor modifications: frame-free! integrated navigation