trying to fix tracking of changes