20110520 city.surat: Now; units without BUC to get water