Chantal's file for issue #67