Updated Performance issues