smg3 add
more changes
Subtree merged in spoon-knife