Updates to joint editor