Updated kernels stuff