setup changes II