Class fix branch

Fixing arrays