Great! In the future, please put functionally unrelated changes in separate requests though; now we can't put the Genie fixes back until we find out if you've violated Olivier's architectural direction for the memory system.