Updated AHF functions