Updated controls