xmas update 2 - merge from master