Hooking performance control up to the older snapshot. TODOs