added more places and devices