rearranged for generic deployment