Draft updates refs #105