Changed some object oriented stuff, no operational differences.