More cap updates