code changes to get EndToEnd working...