2nd Version of Map functionality in State Tuned app