Major internal update