Changes for AHP build