Added control button and discovery mode.