modifications to core files