[Fluff] This might just carry on until update 20.0