Reset now fully works (inc. side comps)
Merging