Updated to the lastest changes of the CPU