Evolve now its own class