stephens changed stuff too!
merged changes with Kirt