Reworked settings from Owain94 WIP