Ported to new Tank features.