custom changes to core