DC,Dileep | #2505 | Including feedback suggestions