Changes for #74