Updates to Capture and RWS