Applying Rob's feedback