Commited #53 after modification of CPU waiting.