Added more updates to the giving blocks and fixed the conflict with Jason's data types.