removed "finished" message conditions