Eample added, cleanup