Upgrde to new SJCL