Another vote for Lightroom. I just started using it and I am surprised how quickly I became productive with it. Wish I had converted to Lightroom years ago.