added more setup work