updated yuletide w/ quick and dirty solution