Tweak commands patch
Functional client @ 1.6.1