inserted addAssignment and removeAssignment