modifications for #43...