Apply Jeremy's changes