Reworking the rain water collection system