Updated with Dec 23 patch and several new third-party map updates