Quick changes going through setup