diff --git a/main.c b/main.c
index 2965ec7..f977ce8 100644
--- a/main.c
+++ b/main.c
@@ -5,12 +5,19 @@
 #include <unistd.h>
 #include <stdbool.h>
 #include <string.h>
-#define NUM_THREADS	11
+#define NUM_THREADS	31
+
+enum thead_id_status {
+	THREAD_AT_HOME = 0,
+	THREAD_AT_PARTY = 1,
+	THREAD_DONE = 2,
+};
 
 struct bin {
 	bool ready;
 	int food[NUM_THREADS+1];
 	int trash[NUM_THREADS+1];
+	int tid_status[NUM_THREADS+1];
 	pthread_mutex_t mutex;
 };
 
@@ -21,19 +28,34 @@
 
 struct bin *party;
 
+static void sleep_random(void)
+{
+	unsigned int val;
+
+	val = 10000LL * rand() / RAND_MAX;
+	srand(getpid());
+	usleep(val);
+}
+
 void eat(long tid)
 {
 	bool eat_in_order = true;
 	long t;
 
 	/* If anyone ate out of place lets take notice of that... */
-	for (t=0; t < tid; t++) {
-		if (party->food[t])
+	for (t=0; t < NUM_THREADS; t++) {
+		if (t == tid)
+			continue;
+		if (party->tid_status[t] >= THREAD_AT_PARTY &&
+		    party->food[t])
 			eat_in_order = false;
 	}
 
+	sleep_random();
+
 	if (party->food[tid])
-		party->food[tid] = 0;
+		if (eat_in_order)
+			party->food[tid] = 0;
 }
 
 void cleanup(long tid)
@@ -41,25 +63,33 @@
 	bool clean_follow = true;
 	long t;
 
-	for (t=0; t < tid; t++) {
-		if (!party->trash[t])
+	for (t=0; t < NUM_THREADS; t++) {
+		if (t == tid)
+			continue;
+		if (party->tid_status[t] >= THREAD_DONE &&
+		    !party->trash[t])
 			clean_follow = false;
 	}
 
-	party->trash[tid] = 1;
+	if (clean_follow)
+		party->trash[tid] = 1;
 }
 
 void *thread_party(void *t)
 {
 	long tid = (long)t;
 
+	party->tid_status[tid] = THREAD_AT_PARTY;
+
 	eat(tid);
 
 	if (tid % 2 == 1)
-		sleep(1);
+		sleep_random();
 
 	cleanup(tid);
 
+	party->tid_status[tid] = THREAD_DONE;
+
 	pthread_exit(NULL);
 }
 
@@ -102,6 +132,7 @@
 	for (t=0; t <= NUM_THREADS; t++) {
 		party->food[t] = 1;
 		party->trash[t] = 0;
+		party->tid_status[t] = THREAD_AT_HOME;
 	}
 	party->ready = true;