improved parser (raw)