Added fast mode