More updates to assignment_kernels