Final tweaks to exp