New Header fixed and updated functions