expand this regex a bit