Added some functionality to Tony