First release plus desullivanize changes