Updates by AquaVerde