Added finished flag