Upgraded gitwar - which required slight refactor on setState