change parse logic