Prepare to switch all returns to creditReturns