modified Array and classes