Geo updated to comply with best practices.