Latest changes that worked really well.