Refactor done[2]