A mathematical model is applied to the tank of Kipseli in Athens, Greece, which is used for storage, balancing and emergency chlorination. A Flow-Through Curve (FTC) experiment is performed for the initial geometry of the tank. The shape and the characteristics of the FTC show a very poor hydraulic efficiency, with extensive short-circuiting, intense mixing and low detention times. To improve the hydraulic efficiency of the tank the use of four alternative arrangements of guiding walls is examined by the model. Prior to its application, the model is verified by comparing the predicted FTC with the experimental. A satisfactory agreement is observed between the calculated and the experimental curves. Then the model is applied to calculate the flow field and the FTC for the four arrangements. Calculations are compared and the arrangement which shows the highest hydraulic efficiency is proposed for construction.