added finished criteria override