Unused code removed
New controls added
new controls added