Another attempt to make commands work.