setup modifications for #1