Performance issues

Performance issues