Reverted the over-written code
Merge branch 'master' of https://github.com/schinnasamy/PD-POC