parsing logic change.