added more parse code