Implement change counter + tests