added new fixes