Code updated after engine changes on map.