updated regex to include _