Issue #5: performance todo