new ADAN implementation. Criteria F plus ADAN bug fixing