Corrected setup (again)