Working version, just new regexp needed