More updates from merge