DC/Dileep | #0000 | reverting old approach