Refactoring AHFA state logic: t+
Refactoring AHFA state logic: t+