Updated sync from production