Improve line mode