Updates to cpu.c