Always use scoreboards, fix state save/load