Update to support 84+ CSE