Regex changes to allow spaces