Updates for #231