Match longform's changes