Added some more controls, I think.