Refactoring commads :) thx amunak!