New changes for test