Increased Number of Locations on Map to 200 + Added parsing of device