remodify TParser and grammar