edited parser