Rest of the last patch