modifications for #3