Gentleman moves better now
Merged changes