Andrew's changes may cause conflicts.