improvements to cope with donations