ATFD and WOC added