Added additional controls
Removed the void element