Working new style deployment