adding some regexp, there are some errors somewhere