modifications for #44