Changed some things with changes