Added some more functions and made into user friendly to test