Added some optimizations to the image evolver