Updated to make term coherent with gui