VE-566 refactoring a bit to only send the data that's needed