H2OFF and WAMM updates