Preparing for Advent edit 2019 version