Change a few things around