Added location Data

Added location Data, fixed some repeat bug
Added Location Data

Added location Data,

Bug:

Need To fig repetition of events