several updates using learnings from municipal