Added more GPS stuff