more changes for dave export