Kernel rework