various changes for ds