testing more fixes