Changes made to match the instructions