Upgrading our rain catchment system