massive rework for SS 3x