Uses improved YIN