more changes to core