Added jeff's changes;