updated to handle work flow changes