Change some things around