partial changes to add GPS support.