re-add body, add setting to force draft