Updates based on Raj’s requests
Merge branch 'master' of https://github.com/normalnorman/MetropolisApp