Added google map and change function format