Revise extended fetch algorithm