Did some more stuff
Reverted back the Commands.xml