- cleaning up existing example, see #20