added line numbers handling