Probably done config revamp