[CHANGE] further nawom parsing;