Tightened up fold and call