trying out more fixes 2