new spectrum analyzer
fixed merge conflicts