needs trajectory cleaning