Updated xmas engine