First shot at state preservation (decode hook not called yet)