Added (a bit) of regex