Tweaked pre CWS upload