Improve performance somewhat
Add section Performance