kernel changes (for now)