More fixes for adding rehearsal threshholding