More H2G2-fication