Tweaks for CBT rev F