new fixes 3