A8 changes
Merge pull request #38 from raheelahmad/a8-fifth

A8 changes...