Implemented last feedback for 3pc
Merge branch 'master' of https://github.com/TNG/Dares