Changes for the new hardware