Live test, tweak and final fix