Final completion version