light modifications, made it work with new kernel style