Faverville: some changes