forgot to add lat and long params
fixed merge conflicts