User Activity

I've been happy with my 40D but I want to upgrade. Costco has a beautiful 7D kit on sales for around $1600.00. Does it have the 2.0 firmware? Or, should I wait for the 6D with the built in HDR?  I don't care about the video.