Tweak W|A calls