debug 3

rollback: one change at a time