Moving up to Foundation 5.2.2