variable rename from deprecated version, and some testing element removed.