Updates by Am-Team