still trying to fix the regex