Changed some things with Setup