I think I made all necessary changes in parser