Getting in Twitwi's changes