Updates for #52