Improved trout command