Working upon removal.

Upgraded controls.