with/without changes + tests