Reverted back to 7. Added 8
Merge branch 'woops'
Reverted back