(This is something we may want to review as we change our deployment structures)