Ongoing changes for give-now