changed arrays to standard collections