trying to merge in newer code