Now commands return true + added break