added more controls