New parsing almost finished