adding some regex stuff back in