Template + Adjustemnt Factor fix