Still more clipping issues - but getting better