changes for new system