Added control functionality