More changes for testing