Refactored these methods to use donor id