Added linear waiting.
Fix extended version.