- I 'think' I fixed the overlapping this time...