Step 1

Put water or broth in a large stock-pot. Add onion, garlic, lemon (lightly squeeze lemon into the water and then throw the entire lemon halves into the water as well), thyme, and bay leaves. Season with salt to taste. Bring to a boil, then reduce heat and simmer about 5 minutes before adding shrimp.

Step 2

Add shrimp and simmer about 2-3 minutes (depending on the size of the shrimp) or until the shrimp curls up and turns pink and is no longer transparent.

Step 3

Quickly drain (discarding everything but the shrimp) and place the shrimp in a bowl of ice to cool quickly and to halt cooking.

Step 4

Peel the shrimp (leaving the tail on if desired) and serve. If not serving immediately, refrigerate until ready to serve.

Step 5

Combine all ingredients and refrigerate until ready to serve.