20161215 city.surat: Proper accounting can help diamond units cope