Added performance. Fixes #3