Adding some changes from Gasbuddy project