Add switch for skip gap on replay