#535 – the biggest changes