better migration path from old hwaf