Checked in by Rudy for Updating YHDFunction