Rigorous testing this time, everything is passing.