synchronisation bug, and remove stupid yields