updates
refactored parser