pull jeffs changes into sink