More work on spawning tanks