Refactoring commands
re-adding commands