improved tanks and scalability