Better interface for draft and done