Added collapsing/running and jitter