Changin Regex to include spaces