use the new work flow