More Scratchpads update