Updates by AMECFW