Old regex implemented, replaced with new.