Updated work flow