#6 - External Locations setting added