Updated evaluation function, removed ArrayList abuse