more setup modifications for #1 (still needs to be cleaned up)