Update to current setup