Working for now.
Merged 6.6 & 7