Changes for #40