Changes to prepare Manchester deployment