Update before switch to JF2