Added some control