Updates by AGUATUYA