added some more controls