small modifications for adapter