Fixed the edge case with rigid body. Made minor optimization the kernel block function