Fixed to work with new paramList