Added some more control