Add changes from exercises