Updated to work better with the DSS