(maybe avoid the diff here?)