Added fast finish option