Adding in some new credit and disambiguation code I drafted.