Updated map and engine