Changed, squashed and resubmited