rework to jnxstack