Making make_call less secure to support stuff