Added more controls