Made the requestsimulator backward compatible with CS, too much of a nightmare not to