added initial_setup