removed duplicate call
Removed redundant calls
Location check is much stronger
conflict on UserSettings resolved