initial changes to introduce WTF