Update to new version of overall code (bugs)