refactoring + preliminary detune support