changes for new compiler