fixes for fucked function ivokation syntax