..... Added some functionality