added upgraded version draft