change the way the first call is handled