added reg ex stuff