performance enhanced - tested ready to deploy