Add changes for solution