Added Anthony's changes to avoid merge conflict