6.5 prep
Merged 6.5