GSW: added line numbers