Added some changes, to create a working upgrade