Added comments and drafts