Addition of CWB + reformatting in line