Roll 10 - 231

Sam's sore feet get a patch job