adela's requested changes to zag logic
Merge branch 'master' of github.com:IntersectAustralia/faims-android