update to core and perhaps more