Changed the code-dasher and wrapper to copy-&-paste approach