Correctly handle tweets - Fat commit