Starting to modify the code