shifted some things, added annealing