Should now be easier to deploy to a new system