Added location updating and finding near