working on fixing regex