changes to core files