changes in custom parser