complete rework of jsi v0.1