Update for use with our kernel