fixed naming, removed commander