working on improved trajectory