more modifications to core files