Putting a few things in a better place