Added propper code to handle new kernel style.