Changed some things up