All changes for a working version