updated regex to accomodate spaces