Prepatch and more working shop keepers