patched up commander temporarily