continuing working on GPS integration