Added some functionality, may be helpful