Some change to suffix call