some goodies for #14 and #15