trying to add more fixes