Add extra line checking