undoing some changes pierre made