many changes = much simpler