CAP6 Implementation
Fix tier mistake for CAP6
Merge pull request #470 from jas61292/master

CAP6 Implementation