new fixes

try again