Added a regex to write less code