3rd attempt, fixing cumulative shifting effect