Lots of Change in Supertonic implementation