Updates by Aguardio