Updating to the new header file