Update for New Hook code