Finished annihilation and made performance improvemnts