toll parsing logic change