Added some controls for test