Apply Lucas's changes from yesterday.