Combined version as of 12/7