fixed functions call untested