added lots more controls