Revert 1894b4e..a54ec32

This rolls back to commit 1894b4e2c6a4e2f46458dd12584c6df703b9e3a6.
more controls added