attempting more fixes