TreeSet changed to ArrayList