New changes for the code