Added fast_finish