Updates by AQUASAF