Rewrote config and more