refactor + authoritative task clone