Enhance computer inventory. closes #2490