Added scope guards to evolve