Updated for Kernel >3.11