Changed some jobs for CWS TP.