Updated for CS6
stuff