All Performance issues by Endang