Setup refined