Heri | #NA: Fixing DS edit functionality