Updates by AQUADAT