Setup improved