v6 rebuild Update Aug 16