Changes for experimental kernel