ShooShoSha tweaks to origin 1.7.2