merge in some of eddies changes