still fixing regex