Latest changes from gypsyMoth