fix map
gasoline implemented