Updated Computer and engine logic