before i refix this function call shit