Added some functionality to Raj