command conditions and more object handling