refactor for new commands complete