Adding donelist parameter, cleaning code
Adding donelist and skiplist