Updates by ATAWAS