better fedps call + exceptions
payment integration
resolve merge BIS