fixed Working of finishDraw and replaced underscore to lodash