Added some regex