changed some things up!