CHANGE EVOLVE CLASS, Fix move problem.