change for add/edit, not ut yet