Changes for the new Hawk code