changes to core node behavior