Added additional controls