More sensible deploy logic