More updates to main