Updates by A.A