cahnged catagory and refined regexp