xmas changes
merge fixed