Hardware and performance

Performance issues in 1.8 (Stay 1.8 or revert to 1.6)