0000893: Draft upgrade