changes on parser