Redo configuration, hopefully this works?