Replace previous sample for track decision

with bugs