added data parsing