Update to latest twitter text, keeping Josh's changes