Rubriek: performance improvement