Hardware and performance

Performance issue with 2.0