Fixed cpu, added cpu&sys