updated dataparaser