PERF-8 Add some magic.