Revised collector and tank with hex model.