-%\newcommand{\Pstates}{\Xsub{P}{states}}
-%\newcommand{\Pstatic}{\Xsub{P}{static}}
-\newcommand{\Ps}{\Xsub{P}{s}}
-\newcommand{\Scp}{\Xsub{S}{cp}}
-\newcommand{\Sopt}{\Xsub{S}{opt}}
-\newcommand{\Tcm}{\Xsub{T}{cm}}
-%\newcommand{\Tcomp}{\Xsub{T}{comp}}
-\newcommand{\TcpOld}{\Xsub{T}{cpOld}}
-\newcommand{\Tcp}{\Xsub{T}{cp}}
-%\newcommand{\TmaxCommOld}{\Xsub{T}{Max Comm Old}}
-%\newcommand{\TmaxCompOld}{\Xsub{T}{Max Comp Old}}
-%\newcommand{\Tmax}{\Xsub{T}{max}}
+\newcommand{\Ps}[1][]{\Xsub{P}{s}_{\fxheight{#1}}}
+\newcommand{\Scp}[1][]{\Xsub{S}{cp}_{#1}}
+\newcommand{\Sopt}[1][]{\Xsub{S}{opt}_{#1}}
+\newcommand{\Tcm}[1][]{\Xsub{T}{cm}_{\fxheight{#1}}}
+\newcommand{\Tcp}[1][]{\Xsub{T}{cp}_{#1}}
+\newcommand{\TcpOld}[1][]{\Xsub{T}{cpOld}_{#1}}