More updates and special cases.