revamp custom-commands