BUG: Do not reslice when changing trajectory

STYLE: Cleaned code