Equipment for my classroom

I have been using the Arduino Starter Kit for the last 3 years in my classroom and understand that they are going to discontinue the product. I have 11 kits and would like to continue to use them for a while. At the same time, I'd like to start looking at new kits. What recommendations do you have?

Some good kits here, education discount also.
www.yourduino.com
Terry King likely willing to work with you if there are parts you want extra.