changing a few things around