Merge newer code