Updated to make regex work