New changes for testing