improving custom commands