New Kernel and some small changes