Move and adapt to 1.4