small changes + GPS