Cleaned up, re-added speed map.