Incorporated changes from the editor pod.