Bug/acm dsc 710

Fixes all the issues presented in [dsc-710]