Re-add Trip's helpful comments