Evolve function done & fix in db