revise API and parsing