Selective Trout: Revised and Expanded