removed old regex. but new one needs improvements as well