changes on category parser
merge