Command Collection changes just for @gshackles