Minor enhancement to -T, added --partition