Added some code to be tested