update to work with the latest TW