Added modifications to simple_nav & trig