refactored whole parsing to speed up presentation