added exception for ds