Move RDS and CW to outside class