changed parsing for old data