added thrift mode