added SJ plugin from master