changes for deprecated stuff