Changes in regexp for number and lines