-Yet more rank optimisation