I have PI's baggy shorts (Elite). I love the shorts...I HATE the liner. I think the liner is getting a little large for me, and there is just too much padding. Any recommendations for separate liners from some other company that might have less padding?