Simplified some examples