Agreement track changes

Fix #270