Last patch didn't work - retrying with small changes