Fix initial data, Add geo location