Removed duplication bug when moving to user locn