modifications for #41