More changes to rte embed stuff related to Shannons comments