Add hammerhead and G2