Updated handling of affected blocks