Improved Tank System