Added some small changes for testing