Improve TankController;