changed name; fixed some regex issues