changing with diego, added num cores, system type