Updates to circuit and tables