Updates by Aqua-Q