Simplified examples a bit