Now includes versions without reguar expressions