Redoing some of my optimization