Tweaking CommandT