Adding the rest of the code