additional logging + consistent use of change/changed/update