some changes in regex