Fix you part 6 and 15 | ScratchStats